bitkeeper revision 1.1159.130.5 (4179350dKbV8Dl-DTyoBQ9c__K-pFw)

Fix incorrect error path in Xen's p.t. update code.

diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c
index 34eb5b54ed7a1f901f1d51c6652785a8d05d0256..30688db3dad4ceb759a30e2c3d87c35bbdaf5813 100644 (file)
--- a/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@ -401,16 +401,9 @@ get_page_from_l1e(
         return 0;
     }
 
-    if ( unlikely(!get_page_from_pagenr(pfn, d)) )
-        return 0;
-
-    if ( l1v & _PAGE_RW )
-    {
-        if ( unlikely(!get_page_type(page, PGT_writable_page)) )
-            return 0;
-    }
-
-    return 1;
+    return ((l1v & _PAGE_RW) ?
+            get_page_and_type(page, d, PGT_writable_page) :
+            get_page(d));
 }